Android CTS 8.0 Release 2 (4394406)
Merge "Stop using __system_property_area__" am: 90c12683ee am: 0ce0b54a0e
am: 369e25dccb

Change-Id: I1921850653794829a1e0df168afe71cebdc5a795