Merge "Drop REASON_NON_SYSTEM_LIBRARY." into oc-dev