Revert "android: use new platform & non-platform property contexts." am: 9abe34200e am: cd117a4501
am: 2f1c68d497

Change-Id: Icbffe6f5d833a84c9bbe2bdbdfb4329a51648b37