Merge "Implement VMDebug API to mark a class "platform"" am: 57b1bcd199
am: 3e07170b58

Change-Id: I4e1a640f78539b08e91fdcf59a7ff16c179e3e79