Merge "CTS fix: match test to CDD memory requirements" into lollipop-cts-dev
am: d941d32a68

* commit 'd941d32a6852302b06f41b28e1955256705de0c1':
  CTS fix: match test to CDD memory requirements