am 42bcd44b: (-s ours) am d92207f5: am b4715699: am 09c6bcfb: (-s ours) Merge "DO NOT MERGE: Mimmum application memory should be 96MB" into kitkat-cts-dev

* commit '42bcd44bd9b02a849d64e12eea580af0ce6ff40a':
  DO NOT MERGE: Mimmum application memory should be 96MB