Merge aosp/master into aosp/idea133

Get latest refactoring changes into our stable tree.
Should not alter performance or features at this point.

Change-Id: I6af284e7bba7fbbbb969752c97571d772ec1dc4c