List of issues from https://code.google.com/p/android/issues that are fixed by this CL: 183476,183249,183248,183241,183222,183142,183093,183329,182385,182311,182193,182019,73149,181589,179740,179384,178322,178189,178086,178020,177169,176312,175138,172322,172030,171820,170647,167288,163574,161580,161041,159199,151347,144290,136137,132505
Change-Id: I2e96f7444048abd2f666c75bd6ab9640019afb75
This reverts commit c571a9a1d0, reversing
changes made to a29cfefe2c.
This should fix the build break for LMP downstream branches.
Change-Id: I22aac1dd0fb7965a2877bae224bccc8df8ee8e17