1adf4002e7
Also deprecates Build.CPU_ABI and Build.CPU_ABI2. bug: 15018047 Change-Id: If8bda8481b29442c0208ba8a72ec0037e813946c