Merge changes Ifc5f6b19,Iee917bb7 into sc-dev

* changes:
  Flag off predictor usage in layer caching.
  Fix crash in Flattener dumpsys