Instead of grepping out the oemcrypto level from PRODUCT_PACKAGES, which is very fragile. Change-Id: I1ac5b8ace25dd4798d3383304f01496f12193526
Rahul's changes in preparation for adding x86 support Change-Id: Ib51dfa72291857c44be37595be2205dd040fc0dd related-to-bug: 6276794